Skip to content

sandbox: trunk drift#8

Merged
roodboi merged 1 commit into
mainfrom
sandbox-trunk-drift
Mar 25, 2026
Merged

sandbox: trunk drift#8
roodboi merged 1 commit into
mainfrom
sandbox-trunk-drift

Conversation

@roodboi

@roodboi roodboi commented Mar 25, 2026

Copy link
Copy Markdown
Contributor

Standalone PR used to create trunk drift against the conflict stack.

Scenario:

  • trunk drift / conflict
  • merge this before restacking the conflict stack to trigger real rebase conflicts

@changeset-bot

changeset-bot Bot commented Mar 25, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 00ce867

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@roodboi roodboi force-pushed the sandbox-trunk-drift branch 2 times, most recently from f7d0075 to 7a460a7 Compare March 25, 2026 18:45
@roodboi roodboi force-pushed the sandbox-trunk-drift branch from 7a460a7 to 00ce867 Compare March 25, 2026 18:46
@roodboi roodboi merged commit 6208232 into main Mar 25, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant